-
Notifications
You must be signed in to change notification settings - Fork 338
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implmement trading post and finish shuttle refactor cherry-pick #941
Implmement trading post and finish shuttle refactor cherry-pick #941
Conversation
I'll end up squashing all my changes together so I can merge commit this |
Its missing markers pretty much everywhere but in this case its whatever, these files will probably always conflict, and require manual merging. I might add them if I feel like it, but I dunno |
(cherry picked from commit 129892f)
* add * yes (cherry picked from commit 8364086)
(cherry picked from commit f82fd23)
add (cherry picked from commit 00e770d)
Removes metadata merge alongside space-wizards/RobustToolbox#4861 (cherry picked from commit 6ae4537)
(cherry picked from commit 3933490)
* Minor cloning change in guidebook Cloning this should be removed at some point anyway, but im unsure if it can still be found in salv? can anyone confirm? * Changes and updates to survival, removed fluff * Create TradeStation.xml * Forgor * Change hex * Rework this cause it was out of date * Pointless spacing fixed (copy and pasted made it funny,) * revert (somewhat) Science cant set up cloning, so i just removed that part * Remove more space (cherry picked from commit 7ba6a27)
Co-authored-by: Kevin Zheng <[email protected]> (cherry picked from commit 1837459)
* please tell me this is empty * it wasn't empty, fixing that * This should fix it * fix for the fix * address changes * fix * Added some comments, hoping that failed test was a fluke. (cherry picked from commit aa4e7c0)
* Add shuttle interior drawing back Just do it per-tile she'll be right, at least it's done with 1 draw call. * Revamp shuttle console * Bunch of cleanup work * Lables sortito * dok * Pixel alignment and colours * Fix a bunch of drawing bugs * Shuttle map drawing * Drawing fixes * Map parallax working finally * weh * Commit all my stuff * mic * deez * Update everything * Xamlify everything * uh * Rudimentary blocker range * My enemies have succeeded * Bunch of changes to FTL * Heaps of cleanup * Fix FTL bugs * FTL * weewoo * FTL fallback * wew * weh * Basic FTL working * FTL working * FTL destination fixes * a * Exclusion zones * Fix drawing / FTL * Beacons working * Coordinates drawing * Fix unknown map names * Dorks beginning * State + docking cleanup start * Basic dock drawing * Bunch of drawing fixes * Batching / color fixes * Cleanup and beacons support * weh * weh * Begin pings * First draft at map objects * Map fixup * Faster drawing * Fix perf + FTL * Cached drawing * Fix drawing * Best I got * strips * Back to lists but with caching * Final optimisation * Fix dock bounds * Docking work * stinker * kobolds * Btns * Docking vis working * Fix docking pre-vis * canasses * Helldivers 2 * a * Array life * Fix * Fix TODOs * liltenhead feature club * dorking * Merge artifacts * Last-minute touchup (cherry picked from commit c548687)
* Fix FTLToDock - Removed Enabled coz unneeded really. - Fixed SetCoordinates call that got dumped at some point oop. * Fix this docking check (cherry picked from commit 92872e5)
(cherry picked from commit b7ccf73)
(cherry picked from commit 21a9596)
Didn't account for UI scale properly I love transforms. (cherry picked from commit 87e2755)
(cherry picked from commit 4b6e5de)
Also fixed some other stuff I noticed. (cherry picked from commit c23b3d8)
Only thing that even triggers it atm is escape pods. (cherry picked from commit bbb7880)
Branch moment. (cherry picked from commit 574c625)
868ffbd
to
5de30d1
Compare
I'll need to check over my changes again later, but I'm marking it as ready so tests run and stuff |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not exactly going to approve or deny this, since it's a Wizden kinda thing upstream. My own review would just be does it work or not, and does it break anything? Whether it breaks things isn't something I can easily test.
The only thing that matters are changes done in commit 76d0641 as those aren't original |
About the PR
See https://discord.com/channels/968983104247185448/976726219875831828/1215605251885899796
WIP, I still need to clean the trading post code
Changelog
🆑